Fix CameraTile to Remove PiP-OnTile Camera

Change-Id: I80152eaa2f023fcb8c9a3fb5028831dfccb5657c