Merge "Waiting for a TYPE_WINDOW_STATE_CHANGED event when starting Settings from task menu." into main