Merge "Camera: block session init callback until ctor returns" into qt-dev
am: 0e1eecd080

Change-Id: I999510b0513b0b32a86af8e5460aa5688476e9f5