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

Change-Id: I332a1bb9ec353922c8be4c75be92498fd8438a90