Merge "Bring back gear icon for advanced app settings" into mnc-dev