Merge "GuidedStepFragment:  support compute theme from argument or savedInstance"