Merge "Move Configuration creation from Window Manager to Activity Manager."