Merge "Fix extra padding when there are no static notification dots" into pi-dev