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

Change-Id: Ifdd251114452aa3f89c09769e9ace80b409ed1d4