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

Change-Id: I3f7a6a7e1a85e4039416e49c445c8a721375e1ee