Merge "Support for use outside of DrawerLayout" into mnc-ub-dev