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

Change-Id: I66e1a69dd5ff3ba3855c98caeab6d5fc94071e16