Merge "Handle cases for going to SHADE_LOCKED" into lmp-dev