Merge "[Device Controls] Handle taps correctly when the tile is in an inactive state." into sc-dev