Improve camera handler

Change-Id: Id8fe032a56d58875801cacad20cf855e9d658bb3