Merge "Clear test rectangle if previous focus is null." into jb-mr2-dev