Merge "Inherit theme colors on app drawer and folder"