Merge "bullhead: fingerprint: fix navigation in orientation changes" into oc-dev am: 748de16ab3
am: c8271abddd

Change-Id: Ib0a24cbe65bc727493267659977b0ea31e41659f