Merge "Fix unlock failure when app is in reverse portrait orientation." into sc-v2-dev