Merge "Fix status bar autohide with DirectReply" into nyc-dev am: e3e80bde12 am: 2210e541bf
am: 3340e5fad6

* commit '3340e5fad639cf23ce02548d9573cec988a5ff65':

Change-Id: If3f118d42578d9c2f19dbe6c6ed9cabbd19aad3b