Merge "Enable shader cache for applications that shared UID with multiple packages too" into nyc-mr1-dev