Merge "Fix theme provider crashing for non-primary user." into kitkat