Began addressing feedback from BUG #24697

Started rewriting steps to apply an orientation lock algorithm