Merge "DO NOT MERGE clean up old layouts" into jb-mr2-dev