Improve camera availability for active UIDs am: 7b4ab78876
am: 9dd925a069

Change-Id: I8a86be2240a08d94dbe84ddb6e98b6692efa41c0