Merge changes from topic "no_layers_profileable" into qt-dev am: 3893e5d9ea
am: fc16afca20

Change-Id: I6ae1c4b73e9eea6400e0aceb01fdd37a0f7ff7ba