Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/notification_common_small.xml
Status Job ID Name Coverage
  Build
canceled #4157
build

 
  Test
canceled #4159
allowed to fail
code_quality

canceled #4158
test