Merge "Fix potential NPE when turning on screen by activity"