Merge "Disable 'remove' option while setting is selected" into pi-dev
am: 24cfa88e19

Change-Id: I2f737729d9525623bc4b5edb5ff84cae07ee007e