Merge "Fixed button bar hiding permissions screen."
am: 52ca98bf71

Change-Id: I25badee2e0116da4df0485ec3a5fed628b193aef