Merge "Show "Android System" instead of "Shell" on notifications." into nyc-dev