[automerger skipped] Merge "Use getLayerStack() instead of layerStack for...
[automerger skipped] Merge "Use getLayerStack() instead of layerStack for input info" into qt-qpr1-dev am: b419fa86
am: 256d76fb -s ours
am skip reason: change_id Ic8a06c562e970b0f328c539edfa51e206734934f with SHA1 b15ea8a9 is in history
Change-Id: Ibd3993c401fbbf26fd0577f3f6e0cdad2407a331