Merge "Fix attr inheritShowWhenLocked cannot read from manifest."