Merge "Fix status bar autohide with DirectReply" into nyc-dev