Merge "Reduced down slop and added action for expanding notifications (1/2)"