Merge "Data activity icon in statusbar"