Merge "Move postFgsNotificationLocked() to outer block." into sc-dev