Merge "SF: dump planner layers in dumpsys" into sc-dev