* stable-2.16:
Fix mobile display on gr-create-change-dialog
LogThreshold: Allow the annotation to be inherited
Do not show "Patch file" if change does not have a parent
Fix support to use "Default Base For Merges" preference
Re use gr-diff-preferences inside gr-settings-view
Fix avatars not showing correctly
Change-Id: I26b8326304343bbe665b3ddcac401dc7b355a2bc
6967cbe107