Merge "Fix drawer selection to match Material spec." into mnc-dev