Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev