Merge "Revert "Enable LOCAL_LAYOUT"" into tm-qpr-dev