Merge "Disable 'remove' option while setting is selected" into pi-dev