Merge "Re-land "Enable LOCAL_LAYOUT"" into tm-qpr-dev