Merge "SF: Clear layer history when inconclusive to frequent layer transition" into udc-dev