Merge "Make sure to clear previous display's last focus window when reparenting task" into qt-qpr1-dev am: 4f57b5ed9c
am: 32248f52c9

Change-Id: I23f611b30374526579038dba626c39030018ec8f