Merge "Don't crash on removing an unregistered drawer listener." into mnc-ub-dev