am 1c1e85dc: am ea9b3198: Merge "Banish Theme setting to developer options" into mnc-dev

* commit '1c1e85dc5f628c03f484fb51bf13253e7d10feb6':
  Banish Theme setting to developer options