Merge "Change getUid before turning screen off" into pie-cts-dev