Merge "Updating Subscription Info Icon" into lmp-mr1-dev