Merge "Banish Theme setting to developer options" into mnc-dev