Merge "Apply power mode when unlocking" into main