Merge "Make focusable rules respect the drawer status." into mnc-dev