Merge "Prevent ChooserActivity from taking over the system bars" into lmp-mr1-dev