7244333 android guide, layout updates