Merge "Changed task focused to be based on focused app vs. window" into sc-v2-dev