Merge "Hide AOD/LS layout changes"