Style updates from master branch; Style updates for multi select;
Merge remote-tracking branch 'origin/MultiSelect' into MultiSelect