AUS-2544: Remove "remove layer" button as it seats too far south for anyone to notice. Streamline the active layer UI
Merge remote-tracking branch 'upstream/master'