Merge "Enable the limit app icon hiding feature"