Merge "Respect drawer's lock state in drawer toggle." into mnc-ub-dev