Merge "WM: Perform layout based on the requested flags" into pi-dev