Merge "Merge Stack level of window hierarchy (63/n)"