Merge "Simplify the content layout of the DrawerLayout demo." into mnc-ub-dev