Merge "Fix RTL in StatusIconContainer"