Merge "Remove theme setting DO NOT MERGE" into mnc-dev