Merge "Add test for finish SHOW_WHEN_LOCKED activity." into rvc-dev