Close navigation drawer, if open, when back button pressed.

Change-Id: I6cb2fdc3e043028049c1f68843f0582a9b480c94
Merge "Close navigation drawer, if open, when back button pressed." into jb-mr2