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

* commit 'bb64650902badc2d9e4a2ee88200f3b3c9e5eac6':
  Don't crash on removing an unregistered drawer listener.