Merge "SnapdragonCamera: The alert dialog's rotation is not right"