Merge "bullhead: fingerprint: fix navigation in orientation changes" into oc-dev