JIRA: STUDIO-4667
GITHUB: #2583, #2584
cherry-picked commit 27a2536a25104aceda148a9220cdda5cd20c8481 of iZonex
cherry-picked commit 160c61c0cb87d3caf76f2189720a0ad8f48ad21f of renemosner
Thanks iZonex and renemosner
Change-Id: Iedb80e60a30279627f19c1a5746427e44c8e2ec9
Signed-off-by: Stone Li <stone.li@bambulab.com>