Add support for new payload property headers to delay switching slots.
am: 02c4942cbf

Change-Id: Iddeb8c27625a3c0e444ca23b5a0625474f0e723a