Merge branch '19397-persistent-greeter-options-test-case-is-broken' into 'stable'