Merge "Make PI created by AlertWindowNotification immutable" into rvc-dev