Merge "Fixed button bar hiding permissions screen."