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

Change-Id: I08014eb511959e99828ede7a2a3690a71f026a84