Merge "Smaller notification icons on AOD" into qt-dev