[feature request] mode manager return from away with HSM

My HSM enabled when mode is set to away, and I want the mode manager to use the "return from away" feature when the HSM disarms. The only way to do it seems to be via presence sensors or a virtual switch that tracks HSM. Can we please have the mode manager track HSM directly?