Merge "Allow using dynamic skin from android build" into idea133