Merge "Fix initial notification icon visibility" into rvc-dev am: 768171dade am: baad0c1404

Change-Id: I2c2fe609cc321fdaeed48294464be587925e4dd8