Merge "SystemUI optimization - rely on inheritance for layout direction"