Merge "DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones in smaller-screen decor layouts." into honeycomb-mr2