Merge "Fix icon tinting when in split screen" into pi-dev