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

Change-Id: I909306f0c86621e9baee193b16d104a8696f91da