[v1.1.7.1] Merge BB, lock sreen orientation