Merge "Add inheritShowWhenLocked System API to activity."