Merge "Hide app info button from app notification settings header" into oc-dr1-dev