* commit '7eba403e9a64f7153b7e5788902d4f799739158e': DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.
* commit '7eba403e9a64f7153b7e5788902d4f799739158e': DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts.