Merge "Fix missing showWhenLocked activity attribute"