Merge "Apply new keyguard orientation when it becomes non-rotatable" into tm-dev