Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c76c
am: 71feb6467f

Change-Id: I9798141003ab3489af55892d76533f3edac575f7